popupMenu/switch: Follow "show-status-shapes" setting

Whether or not switches include shapes to indicate their ON/OFF
state is currently controlled by the stylesheet.

However there are use cases for both using the HighContrast style
without shapes, and for using shapes with the regular styesheet,
so follow the newly added "show-status-shapes" setting instead.

https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/2675

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3107>

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 9886649ab754dc6d8d49531e50ba43f29e35354d..3842d821816cda5623b3a1b908978feb05bd33fe 100644 (file)
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -368,7 +368,11 @@ export const Switch = GObject.registerClass({
         });
         box.add_child(this._offIcon);
 
-        St.Settings.get().connectObject('notify::high-contrast',
+        this._a11ySettings = new Gio.Settings({
+            schema_id: 'org.gnome.desktop.a11y.interface',
+        });
+
+        this._a11ySettings.connectObject('changed::show-status-shapes',
             () => this._updateIconOpacity(),
             this);
         this.connect('notify::state',
@@ -377,7 +381,7 @@ export const Switch = GObject.registerClass({
     }
 
     _updateIconOpacity() {
-        const activeOpacity = St.Settings.get().high_contrast
+        const activeOpacity = this._a11ySettings.get_boolean('show-status-shapes')
             ? 255. : 0.;
 
         this._onIcon.opacity = this.state